Tidied Workspace. Fixed Dependencies.