organizing files, updating constants