Refactored folder structure. Made control a seperate class