More configuration changes
Structure changes
Testing express now.