Updated directories and organisation