Changed folder structure also stuffs and things