Removed unused resources. Restructured a bit more.