Changed folder structure + new setup