fixed organization issues