fixed bugs, states 'home' and 'settings' now worked
changes to separate files structure