Major Restructure of Files

This is to separate different areas logically in the file system