Added module structure, fix html structure