Removed not needed folders and edited relation