corner-pocket as it's own repository and refactoring
fixed replication issue