Cleaned up dependencies
First step of code re-organisation: route separation
Filter out useless files properly