Restructuring to setup project for serious dev stuff. >_>;