Cleaned up folder Structure