ENH: updated project structure
ENH: updated