Added exports and re-organized