Adding buster and restructure further