cleanup

module and data folder structure cleaned up