Improved folderstructure and some minor changes that I wouldnt remember to do tomorrow