Refactored, changed to app/ structure