Removed prototype code and begain to establish architecture