Revised folder structure
Added fixtures to unit tests