starting to do some proper organization