Changed folder layout and added testing folder