Project files broken up for better organization + incremental changes