Separation between filename and project name, some refactoring