removed unused namespaces from uses
moved contents into subfolder