Re organized cluster methods to more approporiate files for better organization