Refactored navbar classes into own package