Refactored properties and methods names to camelCase
Moved files to the top directory