Refactored Application + Gravit Module into one Module