Renamed files and added funcionality