move spartan into lib folder
Merge branch 'develop'