Classes review

Just adjustements in file names to solve some wired problems