organized stuff into lib dir
file reorganization and first spec