final project restructure

This is the best way to appease the Eclipse god.