Adding and reorganizing for better org setup