Re-org and cleanup, add dao and bo layer and objects
Re-org and cleanup, add dao and bo layer and objects