Changed directory structure, added basic statistics