Moved Files into separate folders and added the OS stuff