restructured folders so it makes sense