Changed folder structure

For easier packaging