Restructure stuff, add ressources and renaming stuff