Changed folder structure
Added tests