Reorganizing file layout so that it's more modular