Cleaned up the file structure and tabs I think