Organize directory structure and add useful modules