Refactored code, moved stats one level up, renamed files from default names