Changed folder layout again

- Changed folder layout again
- Started using paths relative to main script