resturcturing and include additional libs according to Crafty Boilerplate