organized file strucuture a bit more