Moved core functionality into the core folder. This is gonna break jenkins since it wont know where to find stuff now. Damn.: