Restructured project, prepared for multiple resources.