Change application structure to be a bit more homebrew friendly