Updated structure to integrated better with GitHub