Alpha 3.1

Updated hierarchy, got rid of unnecessary scripts and scenes. Tried to
fix collision problem, but more work needs to be done.