Reorganized files and added shortcuts