Fixed makefile, redacted unsupported commands
Removed timber dependency; renamed submodules