Added additional dependencies and some project structure