new file structure, code style