Refactor to remove incomplete modules

TODO: Clustering, security