Re-arranged code
Updated website