Renamed files for better naming convention
Fixed alignment