Re-factor folder structure to separate parts.
Fix time formatting