Started writing a new file structure and code structur