Moved code into its own directory, and added controls based on serial in