Fixed folder structure a bit and more playing with classes