Refactored folder structure and added headers

Solves issue #3