moved chunks of code back into subdirectories.
Moved misc and user module codes to their respective subdirectories.