Cleaned up the directory tree
Did some refactoring, and moved initial state assignment into the shuttleState constructor