(feat) File restructure to work with deployment