Changed layout of files for easier access