Fixed stop bug, reorganized less files