Re-arranged folder structure to accomodate for pending addition of Java code