Merge pull request #5 from dejan-brkic/russ_master

Fixing compile errors
Merge pull request #6 from dejan-brkic/russ_master

More fixing compile errors
working towards a compile
cleaning up folders
cleaning up folders
working towards a compile
no need to port actions
Decided not to stub. Using dependencies that must be removed
Decided not to stub. Using dependencies that must be removed
compiles