Added support for Tags to PostSpark as well as API cleanup

Renamed the API files to remove redundancy as well as cleaning up unused variables/comments, it won't compile at the moment as Aqeel needs to modify his side to work with the Tags.