Revise internal file and directory structure
Expose some util functions