reorganizing thing and renaming files so that everything fits to gather in a way that is more reconizible