Moved some stuff around, some cleanup, added mask to file names