Changed folder structure - separation into modules