Move files around to attempt to be more standards compliant
Added missing files