major clean up. Files properly created