Fixed file structure, things work now