cleaned up directory for easier redeployment
trying to fix directory structure
trying to fix merge issues...