Better file structure and cleaner code.