Fixed file structure, better naming