Renamed files and changed directory structure