Refactor to support multiple code/css dirs and cleaned up the cli interactions a bit