Rearranged files and moved configuration into sim