v0.0.7 Router and Resource components refactored