Updated filenaming system for abstraction to other works
Added files (forgot in last step