Modularize imports and docs update