Huge update to all files and file structure!