cleaning up the dependencies and modularizing the plays