Added some folder/namespace structuring