Fixed a bug and cleaned up project structure.