Changed Dependencies and Tools to Dependencies

This is to ease compilation in the terminal since spaces can cause
issues.