refactor code into directories
removed bootstrap- prefix
removed -golden prefix