Added folders to organise project