Moved app to root level + a little cleanup