Fixed compilation issues

- now compiles
- structure moved to be consistent with other projects