reorganized folders. This is still not a good library structure, once more things are complete, we should reorganize again