Added basic module structure, renamed