refactoring

changing the files names to keep them organized