Tried to fix file organization further

app currently doesnt work