Organized file structure + separated code