Merge pull request #2 from mitchross/refactorwork-cakewalker

Tons of refactor work.
Removed C.java, replaced with Constants.xml
Fixed Layout issues