Changed alot in the file structure