Refactor, Added Sprint 2 resources

Fucking awesome pull request with really freaking beautiful git history and awesome changes and readability.
*Now merge.*