Organizing

place libraries in correct places