several files renamed (improved project structure)