Updated directory structure, exposed module