Updated file structure

Completely reworked package structure in order to make it FAR easier to
navigate the project. Also updated to Pahimar's setup