changed namespace to asp
moved to a single folder